Install Meld from their webpage http://meldmerge.org/. I had to tell git where it was: git config --global merge.tool meld git config --global diff.tool ...
A new widget for displaying comparison paths with better information and manipulation; Support for comparing different files across panes in folder comparison ...